Merge "Fix logging in libsuspend" am: ac4f4721a0
am: 492fb091d8

Change-Id: I956a41d32bad8f343df2dd7d26857f7217254f81