[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-dev am: 69f3dbce am: 1b7c92b6 -s ours am: 3123a733 -s ours

am skip reason: contains skip directive

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



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