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

[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 3ed3e573 -s ours am: 6991a35c -s ours am: 2ac68775 -s ours am: 3bc1d7ae -s ours am: f2147d45 -s ours

am skip reason: contains skip directive

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



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