[automerger skipped] Merge "Removed state machine from DcController" am: 8e2faa2b am: cd21b3b4 am: a692370d am: 81f91ec2 am: 9f772b4a -s ours

am skip reason: Change-Id Ic34dcb171e711b6712637445ed7257631e87c5ab with SHA-1 06247394 is in history

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

Change-Id: I3f99700e9b367862cbbdd6ac069919a150b501dc