Merge "Enable specification of 5G network info and carrier configs for ONS changes" into sc-qpr1-dev am: 5d57ddce8c

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

Change-Id: I12b9724b53927f14259ca3356721ae31e9e0d9fb