Merge "Add ril constant for slicing config change" am: daa74af0eb am: a646471f5e am: 00c7c02c46

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

Change-Id: I959aba7b1d9b0e87442893a6da266bea49dc3295