Merge "Fix rerouting problem when bit-perfect playback starts." into udc-qpr-dev am: 9ff00129

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



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