Android mainline 12.0.0 release 16
Snap for 7716385 from e21b057b5fc12174bf531189aeb152a560847192 to mainline-resolv-release

Change-Id: I47b45642d3d417b53054c594e8c13230b3412c5e