Ability to choose either suspend counter or /sys/power/wake_lock. am: a833d47822
am: 85ad4a9a10

Change-Id: I2d3b08a40ceb5fc81e8f4853d7c051db1ed4bbee