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

Change-Id: Ie067c0e1e80545934424d358aa9a74d58872ee7c