Merge "Merge "Fix wake lock logic during Dream startup" into nyc-mr1-dev am: 27eb169db0 am: 3217986886" into nyc-mr1-dev-plus-aosp
am: e835fe7755
Change-Id: I0821b721ab3ef090161e671ccd4a32d85739e315
This commit is contained in: