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

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

Change-Id: I96f4adf46cfabfa9696375365150c4d8c8e338b9