Merge "Update jarjar-rules for PermissionController to support location.Flags and location.FeatureFlags." into main