Merge "Make sure the right NetworkMonitor start method is called on S-/T+" am: 894912c85e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1995390

Change-Id: I9c4b84479f2ed1d154b322dfc2911babb8b38479