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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1191379

Change-Id: I6a607157b854233ac8ed4da9f3d982c05b3721c9