Merge "Add prebuilt_etc for nfc permission" into main am: eb0d1e03 am:...

Merge "Add prebuilt_etc for nfc permission" into main am: eb0d1e03 am: 0c0aba31 am: 2e77cd52 am: 5ce3bb95 am: f2584bdc

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2723775



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