[automerger skipped] [conflict] Merge changes from topic...

[automerger skipped] [conflict] Merge changes from topic "framework-nfc-updatable" into main am: 04a158bf am: 8ed216a2 -s ours

am skip reason: Merged-In I22ae8145e6ea328e03949002c79c29aed184f39a with SHA-1 0f7fa6a2 is already in history

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



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