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: 0423e7c4 am: 5b86c5f8 am: e6000a4d

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



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