Merge "Clean up connection to sensor hidl service" am: 7fbbfe2494
am: 05b09af109

Change-Id: I5bae5665696bce47c80634730be214119c5c431c