Merge changes I5dd690b9,I659f927a into main am: 693bf0c2fc

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

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