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

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

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