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

[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 56ac420b am: 78ec2034 -s ours am: e7cfb41e -s ours am: ed32b874 -s ours am: 32e01ced -s ours am: b2bb5e86 -s ours

am skip reason: contains skip directive

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



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