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

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

Change-Id: I19470a4bac2e8c00a7fb52c3980044ada0d215bb