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

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



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