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

Change-Id: Ie1ea29287a3c1e063609817a557497599266524d