[automerger skipped] Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe am: 12eadd2133 am: b7f1c84f5b -s ours

am skip reason: Change-Id I38d7d09be612fa4788cf4052bf304d17f0ae79f4 with SHA-1 17a8eacab4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2f668632111e434b3c549d619782f571f22a78e