Merge "[Settings] Move mobile data template out of framework" into rvc-dev am:...
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb am: 45382e75
Original change: undetermined
Change-Id: Ie0f273bc0e62b44c036ab49eaef1e1ec72f2de99