[automerger skipped] Merge "Fix a Sms7BitEncodingTranslator threading issue,...

[automerger skipped] Merge "Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads." am: 02b66464 am: 1609733f am: 47351ebc am: b0dbffda -s ours am: f23840ed -s ours

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

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

Change-Id: I3a611598ab10cf69f21de845be92603ab2ec120e