Merge "Don't depend on libbase result.h" into main am: 6c7467787a am: 91174e2317

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

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