[automerger skipped] Merge "Fix for GSM-8bit decoding error" am: 164302d4 am: 2990754d -s ours

am skip reason: Merged-In Iad422dbe730ab8d318537d60439210ef8e7d37aa with SHA-1 43fc8c6f is already in history

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



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