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

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

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



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