Merge changes I4e92d70c,Ibf25ff58 into main am: 7c60e2c375 am: 98c4c233ca

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

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