Merge "Add null check for default proximity sensor." into rvc-d1-dev

            Sensor defaultSensor = sensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);

            return thresholdSensorBuilder

                    .setSensor(defaultSensor)

                    .setThresholdValue(defaultSensor.getMaximumRange())

                    .setThresholdValue(defaultSensor != null ? defaultSensor.getMaximumRange() : 0)

                    .build();

        }

    }