Merge "Make PrivateDnsDohTest.SessionResumption more robust against flag reset" am: b537dfdd am: 016238c6 am: e57ed421

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

Change-Id: I862df5dc92432cfcf633be7cbb323509a7567eb6