[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 am: cfcee41d -s ours am: 65711461 -s ours

am skip reason: Merged-In I7c866741dd86c3d675ea7c4dfe50d0992ab145f1 with SHA-1 4da7aabf is already in history

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

Change-Id: I6b94f876d3e82bf74302e2e4d8be9dc8de73ebca