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

Change-Id: Ic441d0866af810504bf99d746c77d02e95b1f035