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

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mobly-snippet-lib/+/24242300

Change-Id: I4989cc991d7b8aad1d0e010fed50fba87aab88db
Signed-off-by: Automerger Merge Worker <[email protected]>