[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: f07170dd -s ours am: 5dc34c40 -s ours am: f6dc36e3 -s ours

am skip reason: contains skip directive

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



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