Merge "ServiceStateTracker consider config for combined bandwidth" into udc-dev am: 393f876d am: 3f587f85

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



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