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

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

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