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

Change-Id: I04c06e68ec1952f23dadbcea20a9ebaa0ffc5de4