Merge "Merge "Merge "Merge "Merge "Change the position of...

Merge "Merge "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" into android12L-tests-dev am: ef540446" am: c02c7329 am: 45e12c32

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



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