Merge "Expose api to retrieve wakelock information per client" am: 6fc5284306 am: 11cd850e66  -s ours
am: 84a940c22e  -s ours

Change-Id: Ia0cd9f66079e874368bd7e0535ffe5f97b0cd9e9