Android mainline 12.0.0 release 94
Snap for 8164116 from 47c4fa65361d2b31ba6c212e35c209054dedd0a4 to mainline-resolv-release

Change-Id: I69caaa7bc5a807ee801dd9695dcd49aa2f5e9d2b