[automerger skipped] NFC - Memory disclosure in rw_i93_sm_format am: 263e1127da am: 5ed331342b am: 29ae69655e -s ours am: 3bd1863ecb -s ours am: 0bb751d5a0 -s ours am: 5bb85f0455 -s ours am: 759cef9e12 -s ours am: 7d64b6a0a3 -s ours

am skip reason: Change-Id If6cd929624f8ae8c2c70295924bea206d82d48f4 with SHA-1 046b6676ad is in history

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

Change-Id: I14d9f521c6d558a5574f5f67aa48630474025ca8