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

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

Change-Id: Ieea012855260f65111d25c9d32a5f92e5dcfaeb8