Merge "Don't use std::result_of" into main am: 14b243b161 am: 3fa708af1b am: 79d81018ee

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

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