tree 7a126729925de374e863bf826858883b85654cca
parent 057e7894ff69685405a24911e3812839ec4b1251
parent 7499f3a1c4dfcd60a4e0aa54436e1469d7822f82
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1552459575 -0700
committer android-build-merger <android-build-merger@google.com> 1552459575 -0700

[automerger skipped] Merge "Only return one mobile subscription per group in Settings." am: 58385e9796 am: c078d39d46
am: 7499f3a1c4 -s ours
am skip reason: change_id I867296b4f8efbdf2e9885ef34dd45806fa0abbca with SHA1 0e7ad2f3fe is in history

Change-Id: I1d9a8be8d264e5975c82eb9b710e7a1e3df78679