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

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



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