[automerger skipped] Merge "[sf] Stop inheriting from std::unary_function"...

[automerger skipped] Merge "[sf] Stop inheriting from std::unary_function" into udc-qpr-dev-plus-aosp am: c4ff7a54 -s ours

am skip reason: Merged-In Ie16ada6f76bee7d9f248dc8349a095b50777c92d with SHA-1 ec8cc07d is already in history

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



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