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

Change-Id: I8648b03fdae989e3db9d0d3492ca9551d9bbf4e1