Merge "build: Allow NFC stack to be delivered as a mainline module or APK"...

Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main am: c5b4b824 am: 18e2263d

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



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