Merge changes I4eaa714c,I85a324d9 into main am: 34eb5095 am: 70a26146 am:...

Merge changes I4eaa714c,I85a324d9 into main am: 34eb5095 am: 70a26146 am: cee42b62 am: dc972610 am: cca45373

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



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