Merge \"Merge \\\"Fix bug where process whitelist manager state would not be correct.\\\" into nyc-dev am: a39d380651 am: 91df8559c0\" into nyc-mr1-dev-plus-aosp
am: 83bf61d450
Change-Id: I43bacb1f213c7ada8bdd4600092bd8e4b1be4882
This commit is contained in: