[automerger skipped] Merge "Only suspend package from system or shell" into...

[automerger skipped] Merge "Only suspend package from system or shell" into pi-dev am: 986d537c am: d9725f72 -s ours am: d17b648a -s ours am: c9b483b7 -s ours am: 82394513 -s ours
am skip reason: Change-Id I50ee768e792266ad2091f1913168e89d5d1463ed with SHA-1 adc39de3 is in history

Change-Id: Idb9118eedcdb471d43077b49b92b5643b1db9b84