Merge "Enforce the rule that the timestamp from timelapse video source monotically increases"

            if (mForceRead) {

                LOGV("dataCallbackTimestamp timelapse: forced read");

                mForceRead = false;

                *timestampUs = mLastFrameTimestampUs;

                *timestampUs =

                    mLastFrameTimestampUs + mTimeBetweenTimeLapseVideoFramesUs;

                return false;

            }

        }