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: 8dfb4237
Original change: undetermined
Change-Id: I86c72b738cefe7d523b3fad63ce8d03aecbacba7