Android mainline 12.0.0 release 94
Snap for 7550930 from ddba8f4a4539f55883b4007edb38a222531f12f6 to mainline-resolv-release

Change-Id: I95dbdc79f99fafc10204a9bdeba0c0b43398d6dd