Merge the 2021-06-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Memory Disclosure, OOB Write, and Double Free in NFC T3T tag

Change-Id: Ib14a0038f89572e23d6393e2de044ff6e7ad2cb7