Merge "aidl: corrected ERROR_GENERAL_FAILURE description." am: 7f86031bee am: 0088ec694b am: 85318d0f92

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2384613

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