Merge "Fix NetworkController no longer tracking userSetup" into sc-v2-dev am: 43c6f30d8d am: 125e2f636a

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

Change-Id: I19306e91ab0cc221fa05caf303481a5f29473405