[automerger skipped] Memory Disclosure, OOB Write Double Free in NFC T3T tag am: f6e6e9fa1a -s ours am: f13cc7fd12 -s ours am: fb7d31eba5 -s ours

am skip reason: skip tag Change-Id I9fcc8d7813e5192810808c207ac0364e279bef09 with SHA-1 16a3bb0b54 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/nfc/+/13674571

Change-Id: I0157efac1491d0e3755835c3a585a16b531a0ca6