[automerger skipped] Merge "framework-nfc: add aconfig_declarations block"...

[automerger skipped] Merge "framework-nfc: add aconfig_declarations block" into main am: 4cac2f7f am: 8e19ede5 -s ours

am skip reason: Merged-In Iafa82071b613f9fdd590b605ab0b07cd587ecd0f with SHA-1 2199d97d is already in history

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



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