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