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

Change-Id: I49cc8aad71254f680c88cc26db5e2848834f2239