Merge "Fixed network agent config not set properly" into tm-dev am: 47896a66

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17394777



Change-Id: I446431adfc628101186e0a201333249dd72870b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>