[automerger skipped] Merge "DO NOT MERGE Extend mPreviousPresentFences for...

[automerger skipped] Merge "DO NOT MERGE Extend mPreviousPresentFences for high refresh rate" into stage-aosp-master am: e3ae5feb am: bbe4b61f am: 5fba46fb am: eb369684 -s ours

am skip reason: subject contains skip directive

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



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