Merge "Add flag for NFC associated role services" into main am: f1ea6483a4 am: 25d40ae9d1

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

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