[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am:...

[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: be2e3b05 -s ours am: ad393387 -s ours am: cc8e3795 -s ours am: 49cc9eb7 -s ours am: c427c9e6 -s ours

am skip reason: contains skip directive

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



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