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

Change-Id: I0f0735ffaafaf3fe99982cff1ff02ad5b846d6e2