Merge changes from topic "am-0a015b6d-490c-4457-896d-fc455854e7bd" into q-keystone-qcom-dev

* changes:
  [automerger skipped] ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid transitions skipped: 89e291ff60
  ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid transitions