Merge "Don't pass non-const refs." am: 2fe71c70ab am: 993922983d am: 188f50587a am: 8cad412344

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

Change-Id: I703c2d5c9fbc5dd988d3b421f912022211fb69b5