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

Change-Id: I254fec3c34e91ec82a6f1167a76b4b1df3918625