Merge tag 'android-security-11.0.0_r72' of...

Merge tag 'android-security-11.0.0_r72' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-18.1_merge_android-security-11.0.0_r72

Android Security 11.0.0 Release 72 (10763435)

* tag 'android-security-11.0.0_r72' of https://android.googlesource.com/platform/packages/apps/Settings:
  RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()
  [RESTRICT AUTOMERGE] Restrict ApnEditor settings

Conflicts:
	src/com/android/settings/password/ChooseLockPattern.java

Change-Id: I174fc1eee753f3fa279fffde51f8733364dfa59f