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

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

Change-Id: Iba216770137e1af79fabf3bf29d15044d07c3ef2