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

* commit '1db0cce028c22fe04b129c8d1f627ac30da84558':
  Fix a race where NLP consent dialog can be shown unnecessarily