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

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

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

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