Merge tag 'android-security-12.1.0_r4' into staging/lineage-19.1_android-security-12.1.0_r5

Android Security 12.1.0 Release 4 (12496785)

* tag 'android-security-12.1.0_r4':
  Checks cross user permission before handling intent
  startActivityForResult with new Intent
  RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity.
  RESTRICT AUTOMERGE FRP bypass defense in App battery usage page
  RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
  Ignore fragment attr from ext authenticator resource
  Replace getCallingActivity() with getLaunchedFromPackage()
  Limit wifi item edit content's max length to 500
  Validate ringtone URIs before setting
  RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()
  [RESTRICT AUTOMERGE] Restrict ApnEditor settings
  DO NOT MERGE: Prevent non-system IME from becoming device admin
  Settings: don't try to allow NLSes with too-long component names
  Don't hide approved NLSes in Settings
  Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
  Don't show NLSes with excessively long component names
  Convert argument to intent in AddAccountSettings.
  [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails
  Only primary user is allowed to control secure nfc
  Add DISALLOW_APPS_CONTROL check into uninstall app for all users
  FRP bypass defense in the settings app
  Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION
  Allow 2-pane deep link to access unexported Activity
  Settings 2-pane deep link vulnerabilities
  RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
  Remove Intent selector from 2-pane deep link Intent
  [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
  [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
  Extract app label from component name in notification access confirmation UI
  RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
  Do not let guest user disable secuer nfc via SettingsSlice
  RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
  Verify ringtone from ringtone picker is audio
  Fix LaunchAnyWhere in AppRestrictionsFragment
  Hide non-system overlay window on ActivityPicker
  Restrict secondary users to share Wi-Fi network
  Change default USB configuration to a RestrictedPreference
  Hide private DNS settings UI in Guest mode
  Do not let guest user disable secure nfc

Conflicts:
	src/com/android/settings/applications/AppInfoBase.java
	src/com/android/settings/network/NetworkProviderSettings.java
	src/com/android/settings/password/ChooseLockPattern.java

Change-Id: If303e44664f8685c6bf0e622a7929e97afb3c9de