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

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