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

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

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



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