[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: 8a1346ce -s ours am: 2a88b66d -s ours am: 56c86192 -s ours am: 2cc57248 -s ours am: 7210bb82 -s ours am: 6ad221db -s ours am: b3a6160d -s ours

am skip reason: contains skip directive

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



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