Merge changes from topic "cherrypicker-L42900000962703660:N58500001398762844" into main am: a9a3f31673 am: 881adc6c75 am: a2f12ec0ea

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

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