tree f5a250216b5333ce946aace4b5f3339d052c4bd6
parent 5a982ecd537e697897185b488c0dd27077c2c879
parent 28e38776bf3494ebff6cf22d07e80f8649fb8830
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1714762052 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714762052 +0000

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-v2-dev am: 11a7319a8b -s ours am: 627dcbedac -s ours am: 54e53afffc -s ours am: 1d3276cee0 -s ours am: 28e38776bf -s ours

am skip reason: contains skip directive

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

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