[automerger skipped] Merge "APIs for 5G slicing" am: 08b9f41364 am: 65c1964746 am: 770d3084d9 -s ours

am skip reason: Change-Id I7433976bfe25bcb2af85ffb9338959cbcc9f42f3 with SHA-1 e7ec282eee is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c13c91ef58cc52bceac6214aa3fef6f7802fe78
tree: f73f69b3476cfc75c7bab491007589befb4e0489
  1. framework/
  2. service/
  3. OWNERS