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

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



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