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

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

Change-Id: Iee799b0ff8601ed66090bf47f1457aca4b05919c