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

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

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