[automerger skipped] Merge "DO NOT MERGE Early return for getPresentFenceShift" into main am: afa61f54fb -s ours

am skip reason: Merged-In I00c1795c11f1dc38e6b4ce3ff49fae79e265f25c with SHA-1 a406f39371 is already in history

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

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