Refactored precise data connection state am: 4f2a849e25 am: fe0c690850 am: f35a5d5a29 am: 74c958e231

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

Change-Id: Ia5187ba67493581a1c99caebe20edd8c1d9374ad