Merge "system suspend: Handle unexpected wakelock stat value format" am: 2e32e07e72 am: ecce139c53

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2030852

Change-Id: Ibbf2b648eb16d56f67f29390f696670eddee2189