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