Merge "Do not query CS in NetworkProvider constructor" am: bfc3c02f34

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512873

Change-Id: I227076074a2d58a4b9e5e8aaa972c6338887f568
tree: 9c75452dde0a4bd533511398eb3a4cd4845db50d
  1. core/
  2. services/
  3. tests/