Merge "Fix API review issues for 5G Slicing feature" into sc-dev am: a7b4cb5b61

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

Change-Id: I82b16359bf487dfe91d7c54358ee4a785ac2bd06