[automerger skipped] cleanup - config_item_ip6() am: 533e31f4ea am: ed1d9fcf94 -s ours

am skip reason: Change-Id I0338f7ac29fdb0de56bd4a500e2a827cab2c47f7 with SHA-1 533e31f4ea is in history

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

Change-Id: If20ad0b8b2deb1e68e7b9565ee3dff8b53c59c50