Merge "Fix audio routing can not work after the phone get rebooted" into...

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

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



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