Android mainline 12.0.0 release 94
Snap for 8164116 from 73220935f5ada1ea66e814e1de0b72380f0cb7ee to mainline-resolv-release

Change-Id: I6e0325e2cb237e2e86c69a88d8613c5d48cafb3d