[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: f28e88e5 -s ours am: 522be97f -s ours am: a55309bd -s ours

am skip reason: contains skip directive

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



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