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 am: 43251a9f am: e5efe626

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



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