Merge "Fix audio routing can not work after the phone get rebooted" into udc-dev am: 4c7e5b6f am: 8995ebd4

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



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