Merge changes from topics "nonAutoIPSelection", "preferredIpProtocol" am: f6682143ac

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2483115

Change-Id: Id186a8e8022ee7032625b1e72de04e09a0e4b8d5
Signed-off-by: Automerger Merge Worker <[email protected]>