Blacklist WAP phones from HTTPS

Change-Id: I4b4585a1dd51b94234c5ab82713fc991c3a64107
Merge "Blacklist WAP phones from HTTPS"