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

Change-Id: I2f9488b6942bb79a176f065fdae522c4e79f1053