Android mainline 12.0.0 release 16
Snap for 7649214 from 77a627e6708544ad4dbd657e815a69eaf99e7841 to mainline-resolv-release

Change-Id: I05c0dcf68c073ac6dce5cfed5731bdaf1862159f