Merge "Merge "Change the position of addAndGetFrameTimestamps when queueBuffer" into android10-tests-dev am: 7eca3198fd" into android11-tests-dev