Merge changes from topic "cherrypicker-L83000030003604164:N29900030057840634"...

Merge changes from topic "cherrypicker-L83000030003604164:N29900030057840634" into main am: e933e38c

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



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