Merge "suspend: reformat using .clang-format" am: b40d2001fa
am: 71189c9870

Change-Id: Idea82026f8c446e499a138e270a822c8629614fb