Android mainline 12.0.0 release 16
Snap for 7716385 from 88df6fdbf7574752acea8b473d7732e5de734bc7 to mainline-resolv-release

Change-Id: I0051e74b4655f8e06924c2a0788eb6658d4bdbff