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: 4191af1e
Original change: undetermined
Change-Id: I6204013f38271d3f53aca613670672d7d8957ca2