[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c126f37b32 -s ours am: 4aa2632f98 -s ours am: b5d4e2d1f7 -s ours am: 242ca31300 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14879976 Change-Id: Id497c736c80fea3a6b2d7a2f53a7c396aa55c965
This commit is contained in: