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