[automerger skipped] Merge "Add support for NFC associated role services" into...

[automerger skipped] Merge "Add support for NFC associated role services" into main am: 88142e1c am: 2c2d48a6 -s ours

am skip reason: Merged-In Id1ff0a7dbef12283a135508d43f66148c08fbba3 with SHA-1 9f6ecc9c is already in history

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



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