Merge "Merge "Fix CarUsbHandler to resolve all AOAP devices immediately." into qt-dev am: 0ef5b5e777 am: 11f231f836" into qt-r1-dev-plus-aosp
am: e115b7cbbc

Change-Id: I358d547e7c54214ff783251e5477b95da7e8b27b