[automerger skipped] Merge "Add toString for SRVCC state" am: aac5467d am:...

[automerger skipped] Merge "Add toString for SRVCC state" am: aac5467d am: 4b60ae98 am: e77d2c99 -s ours am: d301a7c8 -s ours

am skip reason: Merged-In Ife7889cd39a9a0f86b8966849dba93212fb10f42 with SHA-1 c3afd241 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2528706



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