Merge "Use android::base::function_ref isntead of std::function" am: 7514e3b91a am: 70f3767526

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

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