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

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

Change-Id: I4ed04aa023e712715f96c930cd9fbac7ff012a2f