Merge "Add override_voice_service to CellularServiceState" into udc-qpr-dev am: 27aa3414

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



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