[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 56ac420b65

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

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