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

* commit '394686efbb51e7c05e230c4ad3695fadc3aa85a0':
  Fix race condition for doze mode and wake-and-unlocking