[automerger skipped] Merge "Only suspend package from system or shell" into pi-dev am: 986d537c88 am: d9725f72d3 -s ours am: d17b648a01 -s ours
am skip reason: Change-Id I50ee768e792266ad2091f1913168e89d5d1463ed with SHA-1 adc39de3a1 is in history

Change-Id: I3c4159267e3197ee06953c148536fad440c556da