Merge changes from topic "cherrypicker-L42900000962703660:N58500001398762844"...

Merge changes from topic "cherrypicker-L42900000962703660:N58500001398762844" into main am: a9a3f316 am: 881adc6c am: a2f12ec0 am: f6e19be9 am: 33157457

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



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