Merge "Fix failure to check HIDL return status" into oc-dr1-dev am: ddef08e725 am: ab594a7143  -s ours
am: 1eb45fc3ad  -s ours

Change-Id: I7e965d6fe20ebb0349f5d7f118d537192034c552