Merge changes I97e7d06c,I8ba14291,I3a53dc6c,Idca8071c,I6ec64063 into main am: 4ae9a74c7c

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

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