[automerger skipped] Merge changes from topic "nfc_main_merge" into...

[automerger skipped] Merge changes from topic "nfc_main_merge" into aosp-main-future am: 8e8fa8b2 -s ours

am skip reason: Merged-In I33ef62ac567a48f46035adf9ea538996e4743a2d with SHA-1 00bec5f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28461226



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