Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39
am: 8b8a0ef586

Change-Id: I63414de17f71be8f8e24296ba820f5e855f2975f