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

Change-Id: I7318e500272ff6478672acf899ac0407d641f4a1