Merge "Fix wrong return value to SUW from EuiccUiDispatcherActivity" into oc-mr1-dev