Merge "replace R + 1 with S" am: 7eb9f88a6e am: d5ad273033

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

Change-Id: Ifc7daa30ed3b963a2ba2991626eea59d16c8a682