am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev

* commit '6974f6a97028a42ce79b8e9e1869af0ebf5624f4':
  Block address families with routes, not NetworkAgent side channel