Android mainline 12.0.0 release 94
Snap for 7550930 from 4672ab0ea42d6f00de8c48c508c372c13f33e0ee to mainline-resolv-release

Change-Id: I42deb8a538553a23fb4229b9dfc239129b51c28a