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

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

Change-Id: Ic54b49109db259c31c830e1969bcc0485e8c14fb