Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 2ebdd873e0

Original change: https://android-review.googlesource.com/c/platform/external/mobly-bundled-snippets/+/2678056

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