[automerger skipped] Update framework for 5G Slicing am: 389920f0 am:...

[automerger skipped] Update framework for 5G Slicing am: 389920f0 am: 739d79de am: 2e7dada9 -s ours

am skip reason: Change-Id I578cf6e1e46f385f9bacf4d51aa8fce4cfe6fffb with SHA-1 b3d83cfe is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61df2c598a7ba69d8cb6df1522f03a6ddd36af8d