Merge "Use E account only when there's no active sim"
am: 680bebed43

Change-Id: I0aff6ff8f7bfbb7f03b5db4d0cff7355d83a7f97