[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 56ac420b65 am: 78ec2034d1 -s ours am: e7cfb41e5f -s ours am: ed32b8747d -s ours am: 743d3c3277 -s ours am: d0579c2694 -s ours

am skip reason: contains skip directive

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

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