Merge changes from topic "rootcanal-role-switch" am: 7a0cb871 am: 2e2e92b4 am: 6e919f23

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



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