Merge "Do not query CS in NetworkProvider constructor" am: 6a6e5f8479 am: 0d1b3960e8

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

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