Merge "Fix DatagramChannelImpl.setOption(IP_MULTICAST_IF, value) for dual-stack." into rvc-dev am: dc89e90c94 am: b4b9f288de am: 37415276f9

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/10648497

Change-Id: I478af92564d4b77c57fe392ad2b6b9a33320b516