Merge changes I58ae6a07,Icae497f9,I914c46b7 into main am: 9707ab6918 am: ddcd44108c

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

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