Merge "Camera: Remove GPS_LOCATION if set is called with null" into udc-dev

    private boolean setGpsLocation(Location l) {

        if (l == null) {

            // If Location value being set is null, remove corresponding keys.

            // This is safe because api1/client2/CameraParameters.cpp already erases

            // the keys for JPEG_GPS_LOCATION for certain cases.

            setBase(CaptureRequest.JPEG_GPS_TIMESTAMP, null);

            setBase(CaptureRequest.JPEG_GPS_COORDINATES, null);

            setBase(CaptureRequest.JPEG_GPS_PROCESSING_METHOD, null);

            return false;

        }