Merge changes I58ae6a07,Icae497f9,I914c46b7 into main am: 9707ab6918 am: 5eace988fc am: 005ed02c4e

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

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