Merge changes Ib892aeea,I1b5f2b85,I449517fb,I6583aebc into main am: 88815e57fb

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3079094

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