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

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

Change-Id: If74751e28741a56a8eae85880392f2790f13516e