Merge "Use E account only when there's no active sim am: d1c8cd8505 am: 178bcc62f5" into qt-r1-dev-plus-aosp
am: db2133c688

Change-Id: I2c00d6952489d6e7c6c80ec2d8d44a283655cecd