[automerger skipped] Merge "DO NOT MERGE Early return for...

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

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

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



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