Merge "Fix bug for failing to init Offload AIDL HAL service" into main