Merge "ServiceStateTracker consider config for combined bandwidth" into...

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

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



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