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

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

Change-Id: I2b3116ee0577fd355f921f7a65fe2e977ee31878
tree: 926e4b356aa62340220d368c21e122903d85746a
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS