Merge "Clean up connection to sensor hidl service" am: 7fbbfe2494 am: 05b09af109 am: 9f9cdcf24e
am: 1a95647089

Change-Id: I27d1ff8670e261a62b9c9b1f8e5916a6288ac347