Remove "will be removed in ..." comments

All of them are wrong, since 1.20 is out for a while now, and
these methods are still here.

Change-Id: I3b59b61490c9aea5252e25623b0b282295dcc3f6
Merge "Remove "will be removed in ..." comments"