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

am skip reason: Change-Id I71716cdcba382bc5fb1efa5000189f63a57015c9 with SHA-1 649581fdd9 is in history

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

Change-Id: I15305319755edac5e900c8730678cb0f1209561e