Merge \"Merge \\\"Fix bug where process whitelist manager state would not be...
Merge \"Merge \\\"Fix bug where process whitelist manager state would not be correct.\\\" into nyc-dev am: a39d3806 am: 91df8559\" into nyc-mr1-dev-plus-aosp
am: 83bf61d4
Change-Id: I43bacb1f213c7ada8bdd4600092bd8e4b1be4882