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

Change-Id: I45a4895e13c4cfa4dfdc2870b0693f1aed27de3a