[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that...

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb am: 14359bbd -s ours

am skip reason: contains skip directive

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



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