Merge changes from topic "revert-19245451-revert-2022-20240-VLEDXGPPND" into tm-dev am: 4817f4d3 am: 1395f3d4

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



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