Merge "block_suspend: test util to block suspend from shell"
am: 52e6536018

Change-Id: I58fc561e0bfd7db1b6f4765bf28ce9094e218f63