[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-qpr1-dev am: dfaf0f7736 -s ours am: b147128bc1 -s ours am: 06bbc575a6 -s ours am: 2f4d04b7c7 -s ours am: 140d966629 -s ours am: 40c73fc591 -s ours am: efc4e63042 -s ours am: 77518fccfe -s ours

am skip reason: contains skip directive

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

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