Merge changes from topics "ms56-historybuilder", "ms65.3"

* changes:
  [MS56.2] Add unit test for NetworkStatsHistory#Builder
  [MS65.4] Address comments at aosp/1954383