Merge "Simplify the return condition in stop()" am: 584ab08627

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

Change-Id: Ie0701cb9c61afde51b04c902bd9f13f1e0559841