Merge "Allow unsuspending critical packages" into pi-dev
am: 5c4b2f6e08

Change-Id: If318c9e01b240b795c36596167a330297c7fb5d7