[automerger skipped] framework-nfc: Switch to "framework-module-defaults" am:...

[automerger skipped] framework-nfc: Switch to "framework-module-defaults" am: 96dac95f am: 5221496f -s ours

am skip reason: Merged-In I8bd5e38b1482600594c41660d14537cf15b48318 with SHA-1 05836fad is already in history

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



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