[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-v2-dev am: 11a7319a -s ours am: 627dcbed -s ours

am skip reason: contains skip directive

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



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