Merge "Enable specification of 5G network info and carrier configs for ONS changes" into sc-dev-plus-aosp am: 8d2f34dffb am: b9ea0ae39e

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

Change-Id: I33d8b98664f7955d7990b6f99a0bc2d27d87a7d4