Merge changes I30a1bc50,Ifc785251 into main am: 56b9afac53

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

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