Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29d0
am: 730c2d9c72  -s ours

Change-Id: I17a8dfcf0be71bcb667e70bab2834f0b7fd42b3c