[automerger skipped] Skip ab/6749736 in stage. am: 3d26fd87 -s ours am:...

[automerger skipped] Skip ab/6749736 in stage. am: 3d26fd87 -s ours am: 48c9a807 -s ours am: ca565078 -s ours am: 819dc7de -s ours

am skip reason: Change-Id If2a763a815fd10ef23ac270a464c27a52a175049 with SHA-1 fd9ff410 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/12797518

Change-Id: Ibe77d92f60daf2117fd5814c4840038b6c797f45