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: I7e136e9e2cc2e4ef76ec5fd9d31af7465659824e