[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" am: bd268448 am: ac876d9e -s ours am: babde4ef -s ours

am skip reason: Merged-In I7c866741dd86c3d675ea7c4dfe50d0992ab145f1 with SHA-1 0cd98971 is already in history

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

Change-Id: I70dd931761f2c710b5dfbc24254ac065d6c041e0