Merge "Adjust the sequece of checks in maybeStopDaemon" into main am: 60d2491b12 am: 71b3c51234

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

Change-Id: I8f0b852ea1296b051ada62a31633f813f0db43fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>