[automerger skipped] Merge "Add new privileged permission for unique id...

[automerger skipped] Merge "Add new privileged permission for unique id attestation" am: d690893b am: d60f9898 am: 296718dc -s ours am: 7038aedd -s ours

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

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



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