[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: 01e9d5c4 -s ours am: eb410c2a -s ours am: b3ad91ac -s ours
am skip reason: Change-Id I50ee768e792266ad2091f1913168e89d5d1463ed with SHA-1 eb4f716b is in history

Change-Id: Ie8cb1b42684d02a69a9e72157f48f0dc0db0f5f9