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

Change-Id: Idb5225d222ef732b4bdd43896e81bc0b20f7dc8a