Merge "Refactoring: Audio Routing Handler (Step 5)" into main am: 1fe5f59c...

Merge "Refactoring: Audio Routing Handler (Step 5)" into main am: 1fe5f59c am: d37406e9 am: cc04dc5e

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



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