Merge "Fix wake lock logic during Dream startup am: 9ede1d2602 am: 042c2349c6" into nyc-mr1-dev-plus-aosp