[automerger skipped] Merge "Apply ag/12775659 to IpClientManager." am: 77ba0a43 am: 14f751c8 -s ours am: 1f7285bd -s ours

am skip reason: Merged-In I74cb958b68d55a647547aae21baff6ddc364859b with SHA-1 b93712f6 is already in history

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

Change-Id: If8993e8ed9501b5beb55e63f457059ce4d2694a9