Merge "Update LockSettingsService to support hardened FRP" into main