[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: 2cc5724827 -s ours am: 7210bb82c2 -s ours am: 6ad221db42 -s ours am: b3a6160dfe -s ours am: d3181a6856 -s ours

am skip reason: contains skip directive

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

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