Merge "Refactoring: Audio Routing Handler (Step 7)" into main am: c50f9f89...

Merge "Refactoring: Audio Routing Handler (Step 7)" into main am: c50f9f89 am: ae35ab56 am: fc0ae743

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



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