Merge "Disallow MobileNetworkSettings on secondary user" am: c4a4058d3d am: 4ff606bac7
am: 22f6321b30  -s ours

Change-Id: I1b93cab70065fcce6f25a7233d9c902c881c30dd