Merge "SF: Fix mode setting for UDFPS with disabled AOD" into udc-qpr-dev am:...

Merge "SF: Fix mode setting for UDFPS with disabled AOD" into udc-qpr-dev am: a9e60a96 am: fded9e93

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



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