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

Change-Id: I485590f422e07c3bb25daafe74b4af016a3da58a