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

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

Change-Id: I688de46fa2d1b9ff056f2a6a055fbc658912c825