Merge changes I5c5a37ad,I21f3061a,I8d64a7dd into main am: 23992b763f

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

Change-Id: Ifdcff3d1c7c036d8693f1b46c027eb7faf76e1fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>