Merge "Display the correct default for mobile data always on."
am: 737d42a0db

Change-Id: I5302cc5cc7d0847e127fcbf8af42fb6eef54c303