Merge tag 'android-security-13.0.0_r10' of...

Merge tag 'android-security-13.0.0_r10' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-20.0_merge_android-security-13.0.0_r10

Android Security 13.0.0 Release 10 (10763433)

* tag 'android-security-13.0.0_r10' 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
	tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java

Change-Id: I17a1c1d33b2985daa882fe81ea8fde44cbad492a