[automerger skipped] Merge "Handle slice config change" am: 32bad0f6 am:...

[automerger skipped] Merge "Handle slice config change" am: 32bad0f6 am: cb9a4b22 am: aec1ba04 -s ours am: 8d5529cf -s ours am: 247edd9d -s ours

am skip reason: Merged-In Iea93a5574047af03197fb5593cbec1b86e0f3037 with SHA-1 633b4411 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2034108

Change-Id: Id6229ee5a9293cbeac2359902a81517359a15a1d