am 3c8cf226: am 0747145e: am 4bf70778: am 1eb613e1: am 3ece5ae7: Add whitelists for known address, port, and UID combinations Bug: 19461976

* commit '3c8cf2264c9dff01e2f67d0f119c377e8068f880':
  Add whitelists for known address, port, and UID combinations Bug: 19461976