Merge "Vehicle: IWYU" into oc-dev-plus-aosp
am: cbe9865043

Change-Id: Iab2f3d5eebb818711928a87106402f1fefd8f2a2