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

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

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