[automerger skipped] Merge "Add indication APIs to expose QOS from LTE and NR bearers" am: 90f426fa am: 59d91997 am: dd62aee9 -s ours

am skip reason: Change-Id I29b13975288286d9706a1c3fb227eeb46527efc3 with SHA-1 c4faf849 is in history

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

Change-Id: I60068bacad4072539a62f2625eab7a54c1f38db2