[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7b22ad6b4f -s ours am: c2049abd0a -s ours am: 0c8c470967 -s ours am: 601d224949 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090195 Change-Id: Ia1147f4ee84376c7946e99d951a18dd2b9b5ec67
This commit is contained in: