Merge changes I79f72bb4,Ic9c10b05 into main am: c0631c8948 am: b2c6bbddca

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

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