Merge changes from topic "am-96c0685d163e45d3b653ad110723de15" into rvc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f into rvc-dev am: 841583ae am: c2079746 -s ours
  [automerger skipped] [SM07] Make combine subtype configurable from Settings am: 1be2d732 am: ce2f840a -s ours
  [automerger skipped] [SM05] Enable record mobile network stats by collapsed rat type am: 6f813159 am: c4145dc8 -s ours
  [automerger skipped] [SM04] Support fetching data with NetworkTemplate with subType am: b1b80c66 am: b3c3ad76 -s ours
  [SM02] Support record mobile network stats by collapsed rat type am: f2d6fd52 am: 9f0f03b3