Merge "Remove a comment from ConnectivityService" am: 7ed22093fa am: 9a2e010bb5 am: cf6db35e97

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494040

Change-Id: I37083babeee918dc1b8653bd5908e71bcdb3e028