Merge "DO NOT MERGE: Revert "Reset app routes when global a2dp state changed"" into sc-qpr1-dev am: ea6121206f

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

Change-Id: Ibca410b48a013771de4ceb86e2a05772eaa67993