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

am skip reason: contains skip directive

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

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