Merge "Fix bind service failure on Android Auto"