Merge "Require MODIFY_PHONE_STATE to start EuiccUiDispatcherActivity."