tree c7637c7cbcbedec07f62f91364f7b5b1aa44c9d4
parent b68448efca8c833f7213b17dd4198efef8d19b91
parent a520800e9805f049921d5725f58a69c95fbc580e
author Bharath <Bharath.Prakash@harman.com> 1679383274 +0530
committer Bharath <Bharath.Prakash@harman.com> 1679383274 +0530

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