[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: 9c4bda09 -s ours am: f071edf7 -s ours am: f4ce1257 -s ours

am skip reason: contains skip directive

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



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