[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 3ed3e573a4 -s ours am: 6991a35cd7 -s ours

am skip reason: contains skip directive

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

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