Merge "Add support for NFC associated role services" into main am: 88142e1cb0

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

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