Merge "Combine two getVoiceRat methods and fix return value" into tm-qpr-dev am: 0ca2a000

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



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