Merge changes I47a60bd0,Ib777d992,Iba5b9c9e into main am: 095d91484c

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

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