resolve merge conflicts of e8e8cf3 to nyc-dev-plus-aosp
am: 412fa2c

* commit '412fa2c27131858e35b8fdcc6e28cc84333a193e':
  bootstat: Track record inconsistencies w/ a debug metric, bootstat_mtime_matches_content.