Merge "Fix failure to check HIDL return status" into oc-mr1-dev
am: 75dbc733eb

Change-Id: Ie00faa1e2630fc2bb2fc8e5aea9faeae74054147