[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "5g_slicing_hal_vts_on_aosp_1st_part", "5g_slicing_hal_vts_on_aosp_2nd_part" am: eee0a6a2 am: 202c10b4 am: 24a09f8f -s ours am: f4a7d0d4 -s ours

am skip reason: Change-Id I60ae689d9a044f5a84d8960cefc1e4672fbec924 with SHA-1 08d6f7bd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7930ff86d4c433d50e43c43e9ea1001636da3d23