Merge changes I5dd690b9,I659f927a into main am: 693bf0c2fc

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

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