[automerger skipped] Merge "Simplify the return condition in stop()" into sc-dev am: b851d80de2 -s ours

am skip reason: Merged-In I2454c1c080d8954dd3785d4ac6e96fc4131fdb47 with SHA-1 40d931c474 is already in history

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

Change-Id: I1735c7d1c24693f7003bc52a98cae39e41832517