am 72964a37: am 1dc1c93b: am caa6cb3a: am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev

* commit '72964a37e090b17d8dabb05cc7f779237a5f3572':
  Fix race condition for doze mode and wake-and-unlocking