[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6a29f55cfb -s ours am: 4848e0bd41 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693263 Change-Id: I63ca24901584e7a4ce74c1287dd8a1d5e1c4b919
This commit is contained in: