am 9572797c: Merge "Fix an NPE in WifiConfigStore" into lmp-mr1-dev

* commit '9572797c3061128bc8f6654854782b61d1b8c71b':
  Fix an NPE in WifiConfigStore
tree: 64c8b6304727d10d44a3ebcd63367f28c4d4fd2f
  1. service/