am ec8763a9: Merge "Manage heads up state during notification update." into lmp-preview-dev

* commit 'ec8763a994a9d08cb40f47fa82f35e75a032e5a5':
  Manage heads up state during notification update.