Merge "Ensure we don\'t crash the system server when disabling/enabling...
Merge "Ensure we don\'t crash the system server when disabling/enabling package." into nyc-dev am: 15e636b5
am: f0471c77
* commit 'f0471c77':
Ensure we don't crash the system server when disabling/enabling package.
Change-Id: I545b121559ce1d0b923b2d05cc91b985ddcf6f7a