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

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

Change-Id: Ic8fa66a2295896b36d57de27540a8aa7d043054c