[automerger skipped] Merge changes I509651c0,Id23db8e7 into tm-dev am: 376b417b -s ours am: cc247cd7 -s ours am: 7bd0ac9a -s ours

am skip reason: Merged-In I509651c0f5b6682eaac2a25edaff61cc02539e30 with SHA-1 c870cb4b is already in history

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



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