Merge "Expose api to retrieve wakelock information per client"
am: 6fc5284306

Change-Id: I1a9e1257592dfd7b73cac7d885ffa99bcd178148