Merge "Merge "Merge "Change the position of addAndGetFrameTimestamps when...

Merge "Merge "Merge "Change the position of addAndGetFrameTimestamps when queueBuffer" into android10-tests-dev am: 7eca3198" into android11-tests-dev am: 40b131e0" into android12-tests-dev am: f2dfe9ac

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



Change-Id: I338c705bc346b7cce8bb0dc5b1d471cb0e80c6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>