Merge "Dual ring-tone played on AAOS" am: 1d775986 am: 8f6da3e8 am:...

Merge "Dual ring-tone played on AAOS" am: 1d775986 am: 8f6da3e8 am: a2f98624 am: 2f4e68bb am: 7d1aa6a7

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



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