am c7bdf1ab: Merge "Fix expanded notifications on lockscreen" into lmp-dev

* commit 'c7bdf1ab11f2c66b8db6023ac817b142b2ec15f1':
  Fix expanded notifications on lockscreen