Merge changes from topic "revert-19245451-revert-2022-20240-VLEDXGPPND" into sc-qpr1-dev am: 6dbc88f61c am: 125e6f98b3 am: 4fea8bf2df am: 62de52e866 am: 6c2a0662b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441568 Change-Id: I6985fccb1d9ef9e1101eaf4c5e1620b075f4852e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: