Merge "[SB Refactor] Support all possible data connection ints." into tm-qpr-dev am: 7183782a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21161759



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