Merge remote-tracking branch 'goog/master' into mymerge2 am: c69b4d8ac5 am: 866fcf1ef2

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

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