[automerger skipped] Merge "build: Allow NFC stack to be delivered as a...

[automerger skipped] Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main am: c5b4b824 am: 18e2263d am: d4fd7da7 -s ours

am skip reason: Merged-In Ib2170146d07763ff6c852ce810497ebe1ac2eead with SHA-1 a6d8073b is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2909038



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