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

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



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