Merge "replace R + 1 with S" am: 02842ed864 am: 0c736664e8 am: 022d9de8d8 am: bbcbc3a50e am: 602dacc212

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888215

Change-Id: Ibc609f2730cd543e4b3da90ee2dd8d4e1defc6ee