[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: 3c24b750 am: b19025ad am: 355ebd8f -s ours

am skip reason: Change-Id I5dc97d3c49d0bf4726975a5558360ebf9c09224b with SHA-1 687ffe58 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1579886

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7c3b0b0b0f5296d063cb40cd670096f52647c8a