Merge "Merge "HIDL: Check error value." am: 898137f817 am: 74426e9c2d am: b9b7bfb02f"