Android R Preview 4 (RPP4.200409.015)
Merge "block_suspend: test util to block suspend from shell" am: 52e6536018
am: 89e661c090

Change-Id: Ia8108fc5ccf32b957438c3fbc14d87a1015d04ea