Merge changes Iccc47e83,I163cb274 into main am: 17a51311ef

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

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