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

Change-Id: I38bd6728c94517092e7fc4c752a8e379d66e692e