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

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

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