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

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



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