Merge "[Settings] Fix behavior of mobile data plan" am: ac2c706809
am: 311510b298
am: af76dea7d0
am: 5beca05a95
Change-Id: Ie29c74da74d44e638a812105191fb571d4e9ceac
This commit is contained in: