Merge changes I57de36ba,I75d58e09 into main am: cd00f7a7f2 am: 420ee29980 am: a354379a93 am: 7b64191b96

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

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