Casimir: sync with internal am: 87180015aa

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

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