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

Change-Id: I19c914c8fee60daf8e53195e581301688917f1fd