Merge "APIs for 5G slicing" am: 08b9f41364 am: f898afeaf8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593931

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1232091caedbe49009667c5f34af543bb5c5be07