[automerger skipped] Merge "[CDM perm sync] Skip user consent for the same OEM...

[automerger skipped] Merge "[CDM perm sync] Skip user consent for the same OEM devices" into udc-qpr-dev am: 33be01e8 am: 336af62f -s ours

am skip reason: Merged-In Ic0633860856afa881ac78798acc079d99405438c with SHA-1 640525c3 is already in history

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



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