Merge "Apply KEY_CARRIER_USSD_METHOD_INT for short code" into tm-qpr-dev am: f7407c5e

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



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