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

Change-Id: I3e53d20ed90555381d273fac6a754bc6b8b1d7c4