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

Change-Id: Ic4be812f180e47a3c45ffb8a79d49133f0648a12