Fix abort due to missing hidl status check am: e641294b59
am: 3d2206df82

Change-Id: I9a4e4b7c6bf5d61056190be066002888b7659f24