[automerger skipped] Merge "Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads." am: 02b664649a am: 1609733fae am: 47351ebc1b am: b0dbffdaa7 -s ours

am skip reason: Change-Id If8347a27a79351e84060c9a35e1cc9efd468f7a0 with SHA-1 131781145d is in history

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

Change-Id: Ib150ee48c092dc089a739ac188239cb19aabd12e