Android mainline 12.0.0 release 16
Snap for 7734064 from 4f793f7db84e909e1a5a073944aa183c07c0cccd to mainline-resolv-release

Change-Id: I87a79a252381e0792366bad265e8bf0ca5452984