Merge changes from topic "revert-19245451-revert-2022-20240-VLEDXGPPND" into sc-mainline-prod am: acc5f458 am: 1cf84625

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



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