Merge "Fix failure to check HIDL return status" into oc-dr1-dev am: ddef08e725
am: ab594a7143  -s ours

Change-Id: I9bfe6d94bb690b64f75d182c0f97078e8db600c5