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

Change-Id: I41b40f91c6032b6101d7086994be27d3aef0bba9