Merge "Update effect AIDL state machine graph" into udc-qpr-dev