[automerger skipped] cleanup - ipv6_host_id and is_dynamic_iid am: 2f45839780 am: 9f68dda9b6 -s ours

am skip reason: Change-Id Ie3ed4583a95f15165a05412a556bae99dc07706b with SHA-1 2f45839780 is in history

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

Change-Id: I003ad90686c5eb897a6968aacddc88b18477dcbd