Merge "Change the position of addAndGetFrameTimestamps when queueBuffer" into android10-tests-dev