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: I0424e59a6dfbcc5e0cb94f29f3ec2c7469961e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>