Merge "[sf] Stop inheriting from std::unary_function" into main am: 91600505

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



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