Merge "Disallow MobileNetworkSettings on secondary user"
am: c4a4058d3d

Change-Id: I436790a24841d70329ead05f0edc8f21cf9a3a5f