[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