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

Change-Id: I6a94cf6465b9c7127b54a2e3fb4f7ee7b62b2c52