Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  Use after free in phTmlNfc_TmlThread

Change-Id: I2b3116ee0577fd355f921f7a65fe2e977ee31878