Merge "Add flag for NFC associated role services" into main am: f1ea6483

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



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