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

Change-Id: I4ead362bbd3556f64c9e5bcd5a31c2d74fa51019