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

Change-Id: I5a34826947410103ca2db77f61c56ef72a2a494f