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

* security-aosp-tm-release:
  Possible deadlock on the NfcService object

Change-Id: I6cf88dbf25c24a8b8b213dc1c51a86c4ef1bd4ea