Merge "Only suspend package from system or shell" into pi-dev am: 986d537c88

Change-Id: Idae1253f8530ca10612bd274818e90a82c3486b7