[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 skip reason: contains skip directive

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

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