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

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

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