Merge "Merge "Assert whitelists are revoked on uninstall." into nyc-dev am: cd8e99563b am: 11cda18ea6" into nyc-mr1-dev-plus-aosp