Apply ag/12775659 to IpClientManager.

ag/12775659 was merged only in internal gerrit and prevents us
from moving or deleting IpClientManager in AOSP.

Apply to IpClientManager the changes made in that CL.

Test: m
Bug: 155703208
Merged-In: I74cb958b68d55a647547aae21baff6ddc364859b
Change-Id: I9e1f9bf5b28b87cfd40cf3abbf8bcd9abf46ecfe
1 file changed