Merge "Fix for GSM-8bit encoding error" am: d120002396

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

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