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