[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android...

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-qpr1-dev am: dfaf0f77 -s ours am: b147128b -s ours

am skip reason: contains skip directive

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



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