Merge "SF: Fix ADPF regression due to wrong present fence" into udc-dev am: 01201564a7 am: 20e8741904 am: b2262b9dc0 am: 8e802a74ca

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

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