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

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



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