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

Change-Id: I5f85ecb0b2434836fa1dd4c508d3f24290d19bf3