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

* commit '11cda18ea6bb5368bf766ca1841c52958541c633':

Change-Id: I12a4d2aea403d40dd8ca9c1417083fc7db9a2564