[automerger skipped] [sf] Stop inheriting from std::unary_function am: 6a9953b0 -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: I14c918a741ce26407185c651a2ea3aaca979b6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>