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

Change-Id: I1275201dc2d3804f95e6bb90beee7b95e5cd5029