Android mainline 12.0.0 release 94
Snap for 7550930 from 9f54fe5a3b9a93d723e320ec5e5413f55ea0e7aa to mainline-resolv-release

Change-Id: I9b492867956bd2334cef8a0b0b74078cf5ab808a