[automerger skipped] Merge "Revert "Revert "handheld_system: Use build flag...

[automerger skipped] Merge "Revert "Revert "handheld_system: Use build flag for NFC stack in..."" into main am: d5074b3d am: 237142f2 -s ours am: 3bbf9436 -s ours

am skip reason: Merged-In Ic8fdadeaf49eafb2119a94e6dd61b808c60fad96 with SHA-1 57c1fa5d is already in history

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



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