Merge changes from topic "am-e303b65a31fd45f38b40d2bfb2fa3e1a"
* changes:
[automerger skipped] Merge "DO NOT MERGE Add new privileged permission for unique id attestation" into tm-dev am: 14e9f410 am: 98c02af5 -s ours
[automerger skipped] DO NOT MERGE Add new privileged permission for unique id attestation am: 4d8825e4 am: 49a1dd5c -s ours