Merge "Fix null DadProxy failure in R Tethering unit test" am: 220e7854bd am: 668adf955c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485808

Change-Id: I3f1d7019f1a12647b78630a412df3adf03e9e95a
tree: b15bf212369dd8baa3c844bea3a8a39448a2cf20
  1. tests/
  2. Tethering/