[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 8a1346ce7a -s ours am: 2a88b66d6b -s ours am: 56c8619240 -s ours am: a254b5f42d -s ours am: ff32fc2fb8 -s ours am: 38e819c9d3 -s ours

am skip reason: contains skip directive

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

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