Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe am: 12eadd2133

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic639b459a37a4dcb90a11a2df39455143316fb5d