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

* commit '1dc1c93b9347380064c183398bb0441d99a33bf3':
  Fix race condition for doze mode and wake-and-unlocking