Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev am: 6715c6abbd
am: f5c030217f

Change-Id: I91d529e072d79aefda24a204ccd653e080a2697d