[automerger skipped] Merge changes I381652d6,I314e8b7f into tm-dev am:...

[automerger skipped] Merge changes I381652d6,I314e8b7f into tm-dev am: e201a900 am: 10070f27 -s ours

am skip reason: Merged-In I381652d69d6e09cf1e11747116708c87ba988898 with SHA-1 6860f6eb is already in history

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



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