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

Change-Id: I5b416016673c78abd75bb220860e43e9ee8ffc5a