Merge "Enable mobile data always on."
am: 6e4fe6b37f

Change-Id: I9758da5105b9a8eac66aaaf9e4a1658685a6a3f7