Merge "Ensure we don\'t crash the system server when disabling/enabling package." into nyc-dev
am: 15e636b

* commit '15e636b570c646c6b45a57eebff5c6197277990d':
  Ensure we don't crash the system server when disabling/enabling package.

Change-Id: I32b8af9a18b5ea00144ca59afb036400be6a84be