am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on"

* commit 'aaf23a9a653457cccf54293b2ff76196718c7a1a':
  Hang off call by power button while screen is on