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

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

Change-Id: I5806e135e8ec1942ac999fbd828c0b2b43897572