[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 788527c931 -s ours am: acb2a488fc -s ours am: 82b3a28f68 -s ours am: 6e39d4ca7c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13850727 Change-Id: I1cff45f22e157ba21a4f96dfa4aca68189526fba
This commit is contained in: