Merge "Don't depend on libbase result.h" into main am: 6c7467787a am: d755f5df48 am: 849e656181

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

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