Merge "Only return one mobile subscription per group in Settings." am: 58385e9796
am: c078d39d46

Change-Id: I748be95d8cf99ac03457ac740829cf5855331444