Android mainline 12.0.0 release 16
Snap for 7550930 from 80db734614f4593cd5cada5158c31cad5cfb5c43 to mainline-resolv-release

Change-Id: Ibea1eec4f91f4e92303a29484f7059edbe990ca7