[automerger skipped] cleanup - config_item_ip() and DEFAULT_IPV4_LOCAL_SUBNET am: 36f4665ab4 -s ours

am skip reason: Change-Id I0cb3fe5bae5f663d07a8cb63f2dd9ef9ca1a6dd8 with SHA-1 98864456ed is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736256

Change-Id: I3b0fde3ffe8096b77a0c144422e759cb755409d4