[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p...

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf am: a265dfa7 -s ours am: 11b0ff5a -s ours am: 83408a2e -s ours am: 123ee982 -s ours am: 6060da37 -s ours am: 5133a8f3 -s ours

am skip reason: contains skip directive

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



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