Merge changes I79f72bb4,Ic9c10b05 into main am: c0631c8948

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

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