Merge "Update package name for ExtServices to whitelist permissions."