Merge "Expose api to retrieve wakelock information per client"
am: 8fbf6a29d0

Change-Id: I1ca7d53b256333170b849cb1103c8b3ca0e76e0b