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

Change-Id: I3139d4162d02660a0d163d7a1e9ac3761d731296