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

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

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