[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: b5bd26e0 -s ours am: e3750aa0 -s ours

am skip reason: contains skip directive

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



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