Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()
  [RESTRICT AUTOMERGE] Restrict ApnEditor settings

Change-Id: Ie5cbf12ca685b26ea5d02ca2bed6cc4a6f9db1ab