[automerger skipped] Merge changes from topic "revert-26560594-cherrypicker-L21300030002461779:N81800030040573477-UOUMTRTVKP" into 24D1-dev am: e1bb375b75 -s ours

am skip reason: Merged-In I688d58c27265829b29d65545238cb2d03619acb6 with SHA-1 f5eeba5011 is already in history. Merged-In was found from reverted change.

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

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

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