Add an extra paranoid check to blacklisting of WAP devices from HTTPS

Change-Id: Ida98aa8e886d3e1cca7f57897435b43dde5defc1
Merge "Add an extra paranoid check to blacklisting of WAP devices from HTTPS"