Merge "Remove TODO that was already done" am: 93d437ba0c am: 7c0bd76ad1

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

Change-Id: If1504548878efc6ee69b3a14c98986efef0b7849