am 58d0b623: am 1db0cce0: Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev

* commit '58d0b623f124c9bee3fe6aba33182c0ff6b1c28a':
  Fix a race where NLP consent dialog can be shown unnecessarily