Merge "Merge "Fix failure to check HIDL return status" into oc-dr1-dev am: ddef08e725  -s ours am: 770eead921  -s ours" into oc-mr1-dev-plus-aosp