fix car service test failures due to missing mock for service query am: 1e8ae4abf2
am: 8cc765b52b

Change-Id: Ieaf9fff3771b44378db66d39ff14c0822a24ae37