Merge "Cumulative wakelock time per uid" into oc-dev am: 1effe000b8
am: 95cf947fba

Change-Id: I58660c0671a49388f8b9fdff28060e9312fa497d