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

Change-Id: I58ebeb2b1094b22db36ace61489e77eecdb79cd4