tree 34e84ff43e1ec253e7aea989e225415e630f273a
parent 5f31f2a3317fc8bc7eaea4f7d05bf18682a886af
parent 522be97f20981fd190d59df261d193bc8392e1bf
author Guojing Yuan <guojing@google.com> 1712166304 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712166304 +0000

[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: f28e88e53d -s ours am: 522be97f20 -s ours

am skip reason: contains skip directive

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

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