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

* changes:
  [MS56.1] Add NetworkStatsHistory#Builder
  [MS65.3] Address comments at aosp/1954383