Merge "Fix shim layer bugs for Sensors HIDL wrapper."