Merge "SF: Fix ADPF regression due to wrong present fence" into udc-dev am:...

Merge "SF: Fix ADPF regression due to wrong present fence" into udc-dev am: 01201564 am: 02d69c76

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



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