[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: 49085501 -s ours am: deafb2d4 -s ours

am skip reason: contains skip directive

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



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