Merge "Remove TODO that was already done" am: 93d437ba0c am: 2797722d0c

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

Change-Id: Ie4b5d3356ee3e60c4b750456bce62a87a9ce8d40