Merge changes from topic "am-30628f6a7d0345608b270c060d37602f" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9 -s ours am: c26af500 -s ours
  [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 28dc43e6 -s ours am: d4b198e1 -s ours
  Fix squished notifications on the lockscreen. am: c29777f4 am: b6790b9f