am 1eb613e1: am 3ece5ae7: Add whitelists for known address, port, and UID combinations Bug: 19461976

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