Merge "Add fold state to service state" into udc-dev am: e8ca7f75 am: 0c8ee36e am: a0fabc70

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



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