[automerger skipped] Merge "DO NOT MERGE: Revert "Reset app routes when global...

[automerger skipped] Merge "DO NOT MERGE: Revert "Reset app routes when global a2dp state changed"" into sc-qpr1-dev am: ea612120 am: 4b9aacf5 -s ours am: e17c0693 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7a6d953f0109e2ac44403f7d21ba52d30562f86b