Merge "Add aggregated partial wakelock time per uid" into oc-dev am: 941d562cac
am: 405a29e608

Change-Id: I409e85aadd6490f1bdb31545b584f31ef4da050b