Merge "Prevent framework from stucking at communicating with HIDL HAL"