[automerger skipped] Merge "Enable specification of 5G network info and...

[automerger skipped] Merge "Enable specification of 5G network info and carrier configs for ONS changes" into sc-qpr1-dev am: 5d57ddce -s ours am: 9fce4234 -s ours am: a0a3593c -s ours

am skip reason: Merged-In I7c866741dd86c3d675ea7c4dfe50d0992ab145f1 with SHA-1 0cd98971 is already in history

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

Change-Id: Id4ef3c0144ec3cd7c2ca4acd253a3d570ddb2ef4