[automerger skipped] Merge "Fix for GSM-8bit encoding error" into tm-qpr-dev am: 84d043ebd7 am: 8b95144afe -s ours
am skip reason: Merged-In I63dca4369c7b4285abb99bfffffe8fd9edbf9443 with SHA-1 76302e12e7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20542412
Change-Id: I9bc44706cdf9310789b7d816a2a102fdfdca44c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: