Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp
am: cbbf530125

Change-Id: Id5ea5536246343a530f7579a31039421b3859de3