Merge changes Iaac422d7,Ia7638b31

* changes:
  Remove IpServer.Dependencies#getIfIndex.
  Address comments on aosp/1559686.
tree: 00c5a17e4a56d8ad6727138e0bb7277bf1d3d136
  1. framework/
  2. tests/
  3. Tethering/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg
  7. TEST_MAPPING