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

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

Change-Id: Id65a0a4485c66d6fe33d67189f1936f80ec3b1be