Merge "Add cleanup upon disconnect of CarService" am: 6379090b6e am: 07d16e3cdc
am: 4975766d1c

Change-Id: I625656d05f9af70215bc8566a2fa658c1668eb21