Merge "Fix Legacy to AIDL conversion for link state" into udc-qpr-dev