Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29 am: 730c2d9c -s ours am: bae8d7a8 -s ours Change-Id: I352f7dc305e64fa5e82bd3cccd9015732ab54504