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

Change-Id: I36eec348af31d1189ee3818acaf63b5d60f29bd6