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

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

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

Change-Id: Ie794ff0cbc442cc40ecf529cfb3d264a0776e0f4