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

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

Change-Id: I358164ba96c0cf2f9c157dd0e04ff2c378bbabba
Signed-off-by: Automerger Merge Worker <[email protected]>