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

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

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