Merge changes I83162c52,I4b4a7775,I9b2cc8de,I0b63d2fd,I8fa2d271, ... into main am: 4ae87eaef3

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

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