Android mainline 12.0.0 release 16
Snap for 7550930 from 2e9888d043bb7b9c6ca8d0ba2c4fa7bb151ec95b to mainline-resolv-release

Change-Id: I7d1bd927202cbef73403d1168cfc906d406d7b07