[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 71418ecf

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



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