[automerger skipped] Merge "Add fold state to service state" into udc-dev am:...

[automerger skipped] Merge "Add fold state to service state" into udc-dev am: e8ca7f75 am: 0c8ee36e am: a0fabc70 am: 485827e7 -s ours

am skip reason: Merged-In I62ff6fb1be3aef6ac9044990b78094025da1da73 with SHA-1 7fcf5f95 is already in history

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



Change-Id: Ic12aac2718e6a2c1b77ab2969ab5abc699651a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>