Merge "Apply ag/12775659 to IpClientManager." am: 77ba0a4383

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1739193

Change-Id: I45986d1a7c41060bd617ad6efdf613188b60aef0