Merge "Prepare for Sensorservice HIDL being deprecated"