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

* security-aosp-rvc-release:
  OOB read in phNciNfc_RecvMfResp()

Change-Id: Icb2d31773312c2f94eba9b88c89fe952962dca6f