Improve readability and remove a completed TODO.

Bug: 141335235
Test: enrolled and authenticated
Change-Id: I0deeacfb3bb0cf08321cc1dcf2588094e0e32c26
1 file changed