[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: 6c572c24 -s ours am: 172969b9 -s ours

am skip reason: contains skip directive

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



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