Merge changes from topic "presubmit-am-60b4d1c1b726424abd201475fc103765" into tm-qpr-dev-plus-aosp

* changes:
  [automerge] Stop tracking unseen notifs on AOD transition init 2p: 63de9cb47d
  Stop tracking unseen notifs on AOD transition init