am b5913bf6: am 4c02d38e: Merge "Use screen-on time and wallclock time for...
am b5913bf6: am 4c02d38e: Merge "Use screen-on time and wallclock time for idleness calc" into mnc-dev
* commit 'b5913bf6':
Use screen-on time and wallclock time for idleness calc