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

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



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