e259bc770b
This fixes the package manager to ensure we can't get in this bad state of an update to a system app being installed as a separate app. Change-Id: I2a3f601bbc06b74f31ca09192993614bc6885ff7