[automerger skipped] Merge "Add metrics for 5G enterprise slicing." am:...

[automerger skipped] Merge "Add metrics for 5G enterprise slicing." am: f55dd211 am: 62d6978a -s ours am: 50496443 -s ours

am skip reason: Merged-In Ib61171cd918fe12acab3b155756fa923efdae819 with SHA-1 de667dc2 is already in history

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

Change-Id: Ifa44f8c023bf1cd5067ba49811804fef495bb456