Merge changes I57de36ba,I75d58e09 into main am: cd00f7a7 am: 420ee299 am:...

Merge changes I57de36ba,I75d58e09 into main am: cd00f7a7 am: 420ee299 am: a354379a am: 7b64191b am: 747bb66d

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



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