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

Change-Id: Ie23a6d5194d082e235b2f544082f76125fcfe9f0