Merge "Do not query CS in NetworkProvider constructor" am: 692a8748a5 am: 46c03b4179

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

Change-Id: Ie9914abd1527c6478f69a0d27e64b69174badd5d