Merge changes Ib61dfbf9,I18a6c5b3,I461c4167,I3d0dd625 into main am: 4d9d458781 am: cfe88b15f8

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

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