[automerger skipped] cleanup - config_item_int16() & DEFAULT_IPV4_LOCAL_PREFIXLEN am: 6be24d8214 am: a31dc167ea -s ours

am skip reason: Change-Id I71716cdcba382bc5fb1efa5000189f63a57015c9 with SHA-1 6be24d8214 is in history

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

Change-Id: Id03324646b1e0417e62b7095c94ee35fdbbd3f76