Android mainline 12.0.0 release 16
Snap for 7631994 from b9e69df3b80e96271a7816ae7be3c3d2dd6ae4f9 to mainline-resolv-release

Change-Id: Ifb8f24b6681a5b41606b9853ba8b8c0b7f17c1e8