Merge "Disallow MobileNetworkSettings on secondary user" am: c4a4058d3d
am: 4ff606bac7

Change-Id: I8060792c986ecac45fca6ef26fab5c5e5924d8cf