Merge "Add cleanup upon disconnect of CarService"
am: 6379090b6e

Change-Id: Ie16e3f39eb1c7791348812ba69e847fe665f8a2d