[automerger skipped] Merge "Fix for GSM-8bit encoding error" am: d1200023 am: 247cc83d -s ours

am skip reason: Merged-In I63dca4369c7b4285abb99bfffffe8fd9edbf9443 with SHA-1 470f0294 is already in history

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



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