tree 2a6da17e5704d887f76cb650d0cf217448841613
parent 71da8923b738c1fff81e0e32994b4e77a3a5635b
parent 5da632b1af180376a66fa6c2d3d230971ee40549
author Guojing Yuan <guojing@google.com> 1712175870 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712175870 +0000

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt" into sc-dev am: 97cf09bb72 am: 14359bbd1f -s ours am: ca1ed38f14 -s ours am: d8ee4d8b71 -s ours am: 5da632b1af -s ours

am skip reason: contains skip directive

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

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