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

Change-Id: I1aad894a587823468b05135654498efb24aea454