[automerger skipped] Merge changes I682f1e43,Ib5435169,Ie738e73d into tm-dev...

[automerger skipped] Merge changes I682f1e43,Ib5435169,Ie738e73d into tm-dev am: c2a8db26 -s ours am: 1e067e14 -s ours am: 304e41e1 -s ours

am skip reason: Merged-In I682f1e4333a4bd271b02a432d376eaa4bfaec5a7 with SHA-1 b03e1033 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18623579



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