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

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

Change-Id: Ic429d239e35c2a9710a76f99e4940852a8e79ebe