Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348 am: f5615c97

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: I0336ea3e2f3e687385793f279e75e46c5a0db54c