Merge "Do not use hidden API PowerManager#wakeUp"
am: 7dca81e995

Change-Id: I90e96a3d98b618660432eb6b0fade1008d4c6007