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

Change-Id: I9706c036af42043392907358ef5bbb60712e39b5