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

* dev/11/fp3/security-aosp-rvc-release:
  Possible deadlock on the NfcService object

Change-Id: I27548db3f58e6f262e1a1312086c22c14b21e0f8