Merge "Convert PermissionManager constructor to use ServiceOptions."