[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that...

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours am: ca1ed38f -s ours am: d8ee4d8b -s ours am: 5da632b1 -s ours am: 1694173e -s ours am: 9630ba97 -s ours am: 195f9704 -s ours am: 3bc71d48 -s ours

am skip reason: contains skip directive

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



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