[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 -s ours am: 44dfbe56 -s ours am: fdde11a3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7c59744b6375b5687355e36e71bfef9fdd371e64