Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp am: cbbf530125
am: 4c8fc962dc  -s ours

Change-Id: I30c51fef823abb8259f961b18f5bba1dcea357d8