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

Merge "[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: dfa6e237 -s ours am skip reason: Change-Id I50ee768e792266ad2091f1913168e89d5d1463ed with SHA-1 eb4f716b is in history" into rvc-qpr-dev-plus-aosp