[automerger skipped] Merge changes I15f97d1a,I88fc3f2a into tm-d1-dev am: f78befd3 -s ours am: 04c39253 -s ours

am skip reason: Merged-In I15f97d1ab79cecccfd20260de198e037db1506b1 with SHA-1 67fa38c7 is already in history

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



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