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

Change-Id: I46613ce9604f5e00cb6a0aef13c5fdc254d731ad