Merge changes I64f0866f,Idfc048d4 into rvc-dev

* changes:
  [SM03] Collect NetworkStats metrics by NetworkTemplate
  [SM01] Add rat type fields in data usage atoms for mobile data