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

Change-Id: Ib0a9eb74f7b31a644472631c10d3a0f1604d8033