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