Merge "Update allowlist for shell and BIND_CARRIER_SERVICE"