[automerger skipped] DO NOT MERGE Early return for getPresentFenceShift am: a406f393 -s ours

am skip reason: Merged-In Ib603c0fd29a3e4cb2fcd99dca59bbd5bfb55a787 with SHA-1 ed1283a5 is already in history

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



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