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

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

Change-Id: Icdc0c7c1a3ebd2962d15b38ebd87e1a28f40938c