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

Change-Id: I8d61c1a22a702cbd23638d46dfad36365b29180c