[automerger skipped] Skip ab/6749736 in stage. am: 3d26fd87 am: eea5ea6d...

[automerger skipped] Skip ab/6749736 in stage. am: 3d26fd87 am: eea5ea6d -s ours am: f3c93ef5 -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: I2f34c690d32781b94989f79c88816046ce721d41