Merge "Check clatd does not stop when suspended network is disconnected" am: d15b397606 am: 3f8661db20 am: 52f35853cc am: 02746f8b1c am: 8f14e15280

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

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