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