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

Change-Id: Ib31f1fbceb2fdc008500ffed8a765baa84d382a6