[automerger skipped] Merge "Reset TelephonyDisplayInfo and timer when data connection state changed" am: d5ef6397 am: 258925ea -s ours

am skip reason: Change-Id Ia2d3edba721752e5ebea89493b2015e5b391fa3b with SHA-1 2e144caf is in history

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

Change-Id: Ibf79e18929e0a17ab04285258dd2f1c77387de66