[automerger skipped] Merge "Created empty framework-nfc non-updatable module"...

[automerger skipped] Merge "Created empty framework-nfc non-updatable module" into main am: a7a5a261 am: 7e349899 -s ours am: 71107585 -s ours

am skip reason: Merged-In Iad08614f0aa3b7bea12a1ad52debd0ee13302a8e with SHA-1 0fa80893 is already in history

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



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