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

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

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



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