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: 20e87419 am: ef45e283 am: 97c5b2f9

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



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