[automerger skipped] Merge "DMD fix flicker vote" into 24D1-dev am: 3c486023 -s ours

am skip reason: Merged-In Ic05ab0401766f6d0edd295ca337b0713f7e367a5 with SHA-1 eca441ee is already in history

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



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