Merge "Stop instrumenting car service fro car service unit test" into qt-dev
am: 38058ebadd

Change-Id: If9ee8f98c90b39a76b6e18f6b0dc4dafccb10789