[automerger skipped] Merge "APIs for 5G slicing" am: 08b9f413 am: f898afea...

[automerger skipped] Merge "APIs for 5G slicing" am: 08b9f413 am: f898afea am: 770d3084 -s ours am: 2ff39343 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6975e3bba4242ad2d987911cd6567ab35cf596fc