Merge changes I3bbae9f6,I23cc7581,I90ab6bb3,I4164766a into main am: 76aacaa0dd am: 1665d2a4dc

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

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