Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  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

Change-Id: I001f65079f2bf4e4ca0da8627c521132573f8843