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

Change-Id: I2f1ea394d1187a41af96da4fab0e5496f52d0221