[automerger skipped] Merge changes from topic "revert-3085486-cherrypicker-L33500030003548614:N45100030056225643-AHBLMNZHOI" into main am: 2597bf426a -s ours am: 71539cd66f -s ours

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

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

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