Remove obsolete TODO

b/206842750 was fixed but the TODO was never removed.

Cherry picked I76e143150fedde851678a43c1909b1aefaca28bb to master due to b/286408867.

Code was merged via `-s ours` and is missing even though the sha exists on the target branch. Cherry pick is required to bring in the code.

Manually remove the "Merged in" directive to allow for downstream propagation.

Bug: 206842750
Test: none
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f2a8c30715c3af5938df0ab488732de694c89e2e)
Change-Id: I1b05bf5749d3365510d6c8a9b20d2fe3eeffc1ff