[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: be2e3b0585 -s ours am: ad393387ed -s ours am: 9c4bda0991 -s ours

am skip reason: contains skip directive

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

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