Merge changes I1d74c8c6,I98438575 into main am: 573e81d71d am: 628d1808ec

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

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