Merge "Get wakelock stats from SystemSuspend" am: dff4801d6b
am: 7c7c466e1b

Change-Id: I149f176165fda0ac02c890677a3c2e97459aaed3