[automerger skipped] Merge "Enable specification of 5G network info and carrier configs for ONS changes" into sc-qpr1-dev am: 5d57ddce8c -s ours am: 9fce42349c -s ours
am skip reason: Merged-In I7c866741dd86c3d675ea7c4dfe50d0992ab145f1 with SHA-1 0cd9897175 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15740062
Change-Id: I432d4ad6945e0d187f2d80e9aed8222a64f0d92a
This commit is contained in: