Merge "Don't pass non-const refs." am: 2fe71c70ab am: 2dafc77581

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

Change-Id: I7c9eea805f3bb394d4e7cf7a0e68c2109f972588