Merge "Keep interface ID stable when rebuilding list" am: 24b30f1a33 am: cb40402ea1 am: 124c2cbed1 am: 6eeb5c843f

Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/1987348

Change-Id: I43725bc55fdd5581283c07227fa694481c8981d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>