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

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

Change-Id: I60020a519a9b7e62f4a54d255af94ef9563e3365