Merge "Add more checks for invalid states when reading webview packages config." into nyc-dev
am: 67dd5183
* commit '67dd5183':
Add more checks for invalid states when reading webview packages config.
Change-Id: I30dad01087adf0ad30b6750d92e66736a4ee3417