Merge changes from topics "cherrypicker-L03700000954505982:N81800001264730321", "presubmit-am-e61d04e7f753492ebd4bdcd4548a007b" into tm-dev

* changes:
  Skip NetworkStatsManager CTS test before T.
  Fix testDataMigrationUtils fail on R device