Merge "Require MODIFY_PHONE_STATE to start EuiccUiDispatcherActivity."
am: 48097bd2d7

Change-Id: I8acd0af65a8152571ef6e07d595eb7c2a92b82c5