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

Change-Id: I1e61c8c8d8c6a1d5f4b4557797d98295adeb87ea