Merge "Don't cancel by UID when an app is disabled or uninstalled" am: 36d606c86d am: 2a99cbb96f
am: 95c0a8e8aa

Change-Id: Ie5437b33a373225750c4ca6799b2da3233fbb43d