[automerger skipped] Merge "Reset TelephonyDisplayInfo and timer when data...

[automerger skipped] Merge "Reset TelephonyDisplayInfo and timer when data connection state changed" am: d5ef6397 am: 258925ea -s ours am: 94ff86c7 -s ours am: f1b36101 -s ours am: 28b74c69 -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: I6438baffb0236852fcdce5a304db117dfdbe4bd1