[automerger skipped] Merge "DataConnection refactor updateSuspendState" am:...

[automerger skipped] Merge "DataConnection refactor updateSuspendState" am: ce252045 am: c41398d1 am: be4660c4 am: 2f0e8253 am: e368b6bf -s ours

am skip reason: Change-Id I39abe0bde114593c2a8cf19d27ae077815c42af3 with SHA-1 68deaa7f is in history

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

Change-Id: I2f0c51e5587cd26c573b2f19575c1b710c35701c