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

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

Change-Id: I313eec1bc724d26e223d8617096d66dd186644fc