Android mainline 12.0.0 release 16
Snap for 7631994 from 7ff930d100a09ace030521770cba8c47ad16a350 to mainline-resolv-release

Change-Id: I8774f2bb2ebed156bf950571b0a7f53ba55f766b