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

[automerger skipped] Merge "[sf] Stop inheriting from std::unary_function" into main am: 91600505 am: 2f9d754b -s ours am: 3fa30961 -s ours

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

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



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