[automerger skipped] Merge "Do not use hidden API PowerManager#wakeUp" am: 7dca81e995 am: f105620b01
am: a4cbafa180 -s ours
am skip reason: change_id I3ba145fbe3eb69ca39c64523f02082a5d7bd2aeb with SHA1 a2a2618200 is in history

Change-Id: I47cd748c1b6584d9ec22c4d579af2272833cb261