Merge upstream-main. am: 480bc27115 am: 0dfc391aee am: 40dc43029b

Original change: https://android-review.googlesource.com/c/platform/external/autotest/+/2112105

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