tree f7686c19437d01c8f4d3bf32389981d0b1b6235f
parent 7b8d8d764fde9a0a0cddf8e1727b82d63081cf9b
parent 207a305d508bd859cc9c4a7dc8c9cb4893f8aa6a
author Sarah Chin <sarahchin@google.com> 1631155435 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631155435 +0000

[automerger skipped] Merge "Support getSlicingConfig() API for 5G Slicing Configuration" am: 1e0c51ccca -s ours am: 394c38fc02 -s ours am: 207a305d50 -s ours

am skip reason: Merged-In Ie32318516bf16dbdb191cba84afc78cb718c1280 with SHA-1 156aa4a4c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1629039

Change-Id: Ie138a286daf1e639d7235daf9f2c0efec02304f2