Merge TODO(b/217397817) to TODO(b/215443343)

Given the current schedule, it might be a bit unrealistic to clean up
all the remaining TODO(b/217397817) in Android T time frame.

Let's merge them into TODO(b/215443343), which is already punted to
Android U.

This CL is only about TODO comments.  There should be no observable
behavior change.

Bug: 215443343
Fix: 217397817
Test: presubmit
Change-Id: Ia9d4277d44e43a31f91d791a23ec894c33cc9d29