Merge remote-tracking branch 'aosp/upstream-master' into merge am: 22b92531fc

Original change: https://android-review.googlesource.com/c/platform/external/mobly-snippet-lib/+/1932020

Change-Id: I2a30bf8257830653e5c273d32182eb11c18420c5