[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: 346dd1bb -s ours am: 71da8923 -s ours am: 0e941d37 -s ours

am skip reason: contains skip directive

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



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