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

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

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