Merge "Fix failure to check HIDL return status" into oc-dr1-dev am: 3373ab6abe
am: eae126d32a

Change-Id: Ied440f27901bc66a0d11d92e18afc79d5e4d6263