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

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

Change-Id: I871c4f73d972b65c21db5ab9640971ad802c51bf