[automerger skipped] Merge "Add new privileged permission for unique id attestation" am: d690893b54 am: d60f9898e4 am: 296718dc24 -s ours am: 7038aedd7c -s ours am: 9e334bd235 -s ours am: 7b8af988b3 -s ours

am skip reason: Merged-In Iecde35b9a79456b293118d8089dd2a3b0905f5f3 with SHA-1 4d8825e4da is already in history

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

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