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

Change-Id: I21ef6e954dd40aca58e598a82e28cf66744e2c1a