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

Change-Id: If72b738a97cf1c2b6d50cb7d171873145267e6d7