tree 0174d5613005aa777451efe398760f4f1f740ecd
parent 6bc48a18e547675a0cd1021b9aa3acc59eb7b733
parent 8fd74849aa4542f974cd602be53a6b768ea2b971
author Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> 1696930872 +0530
committer Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> 1697022593 +0200

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

* dev/11/fp3/security-aosp-rvc-release:
  Ensure that SecureNFC setting cannot be bypassed

Change-Id: I7032e2865fa5560c12b50a84d373572d226eb084