Merge "Fix activity has leaked ServiceConnection errors" into pi-car-dev am: 3799eadaf7

Change-Id: I126a265e0c77325930e82163eeffe07598b64f21