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

Change-Id: I54019e68a84f8abbd87a7cc18402f5c5a6103d83