Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev