Android mainline 12.0.0 release 16
Snap for 7550930 from c2d8370656ab17db24cd5f9b969210487e0b4324 to mainline-resolv-release

Change-Id: Ibf04e90bd2cdff048504ac6476549509d101520d