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

Change-Id: Ib4a00191af77f8c0a61b1d86df7b4c8483938790