[automerger skipped] Merge "DO NOT MERGE Create a single provider of car service" into qt-qpr1-dev am: 8c7181ab91
am: e4528db5c4 -s ours
am skip reason: subject contains skip directive

Change-Id: I797c98950be5da5d686d05b6ed5d54ea4046d43c