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

Change-Id: I14ea10e91cd39494018cb1b32e650898487a8ba0