Merge "Use android::base::function_ref isntead of std::function" am:...

Merge "Use android::base::function_ref isntead of std::function" am: 7514e3b9 am: 70f37675 am: 6d4d2090

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



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