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

* changes:
  Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f into rvc-dev am: 841583ae am: 1a8c0cef
  [SM07] Make combine subtype configurable from Settings am: 1be2d732 am: a9e40da0
  [SM05] Enable record mobile network stats by collapsed rat type am: 6f813159 am: 592ae2e5
  [SM04] Support fetching data with NetworkTemplate with subType am: b1b80c66 am: 37779522
  [SM02] Support record mobile network stats by collapsed rat type am: f2d6fd52 am: 60b26175