Merge branch 'security-aosp-qt-release' into int/10/fp2

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

Change-Id: I1ff4661898e7c4b20310b8b08192b43da4d28497