Merge changes from topic "revert-19245451-revert-2022-20240-VLEDXGPPND" into...

Merge changes from topic "revert-19245451-revert-2022-20240-VLEDXGPPND" into sc-qpr1-dev am: 6dbc88f6 am: 125e6f98

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



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