am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev

* commit 'ea9abd14dc4d4028f74b079c0462dec4fa7d6d18':
  Avoid race condition in heads up snooze code path.