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

Change-Id: Ie2b6887021585a2e7246d66603dadc8d0fa1bd94