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

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



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