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: I771af801c91e5780077d9b97d44a87b5008a9f12