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

Change-Id: I30c38ff14da9dc0adc9b0d758e79f97597bdf8f9