[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: b83b13ac -s ours am: 41c16819 -s ours
am skip reason: Change-Id I50ee768e792266ad2091f1913168e89d5d1463ed with SHA-1 adc39de3 is in history

Change-Id: Ief68523e9d1c4826924bc5c4c487a9c11c8721af