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

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



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