Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev