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 am: 68b19028
Original change: undetermined
Change-Id: I543700ac47c922505c0d00e1c97d398115b4f942