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

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

Change-Id: I2dcd10df1d339a1a24e31632b399f960f749d44a