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

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

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