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

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

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