DO NOT MERGE Revert "Remove workaround for *.clients.google.com." This reverts commit 319e20e0b273b64fb567f73912f71dd33f77b516. Turns out some apps that connect to android.clients.google.com still do not use SNI and thus get served a server cert for *.google.com. Bug: 5426333 Bug: 16635883 Change-Id: I0b2b106c04aeb46f76d2e6a89076390bec3ef00f