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

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

Change-Id: I81fd120c00c876399a69644fa2fe2dd2738b2310