[automerger skipped] Merge "Only suspend package from system or shell" into pi-dev am: 986d537c88 am: d9725f72d3 -s ours am: d17b648a01 -s ours am: c9b483b737 -s ours am: 01e9d5c44a -s ours am: eb410c2a44 -s ours
am skip reason: Change-Id I50ee768e792266ad2091f1913168e89d5d1463ed with SHA-1 eb4f716bf3 is in history
Change-Id: I51aa832df002736d0d5ae45607650ed7ad0df76c
This commit is contained in: