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

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

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