Merge "Don't cancel by UID when an app is disabled or uninstalled" into oc-mr1-dev am: 9543ce8ffe
am: 08455e6b6d

Change-Id: I3e294853f350e362295e516fe9c86864a7224557