Merge remote-tracking branch 'goog/master' into btAdapterFix am: ed17dbb871 am: f192a37de2

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

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