Merge changes I3110f3cc,Iacf494ff,Iea05d235 into main am: b1bf19da66 am: d27586157f

Original change: https://android-review.googlesource.com/c/platform/tools/asuite/+/3297087

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