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

Change-Id: I111260bba3c35a8a2b39c60fcce060cd9b98dbd2