[automerger skipped] Merge changes from topic "nfc_aosp_main_merge" into main...

[automerger skipped] Merge changes from topic "nfc_aosp_main_merge" into main am: e90a4d26 -s ours am: 049d0ef6 -s ours

am skip reason: Merged-In I5a55be1d3b906f8b70482869864e37958a6f27f7 with SHA-1 27145bde is already in history

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



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