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

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

Change-Id: I637570722b3c92530bcd8500b22a620a600c1a41