Merge changes I0e61db91,Icb7ab995 into main am: 0d60b07574

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

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