Merge changes from topic "revert-2022-20240" into tm-dev am: 2921d3f4 am:...

Merge changes from topic "revert-2022-20240" into tm-dev am: 2921d3f4 am: 8efc37ac am: 4b2c05a5 am: 7f49be92

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



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