tree b1e0cd8566ae4ce5e50f8b249a1bf6da241d7193
parent be16430dd52ae34d4a6102d7e4dc7a74dad5b86a
parent db2133c68848f1fe41e7bf6055fde4d2b48ec008
author Youming Ye <paulye@google.com> 1562989797 -0700
committer android-build-merger <android-build-merger@google.com> 1562989797 -0700

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