Merge "implement insertOrReplace()" am: 47851fc01b am: 40899ff9e8

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

Change-Id: Ia4fe20d67bacf5e3e0fa424aeacf1d113db02fdc
tree: cd00f426f1e29504411fdd370e01f5cf1502c832
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING