[automerger skipped] Refactored precise data connection state am: 4f2a849e25 am: fe0c690850 am: f35a5d5a29 am: 74c958e231 am: faed183a3e -s ours

am skip reason: Change-Id I9723d5284c2a8fbae9f63179dc30ddc42da1d0fc with SHA-1 34a09a4cbd is in history

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

Change-Id: Ic0edacb4c6a6d69a696f977579a4f32e13cc045b