[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d4446cb571 -s ours am: c20c16c923 -s ours am: 2c302a85f4 -s ours am: fc8cb4fe2b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15193377 Change-Id: I67b489a62da722f10e7409d648de66abbd2da7a5
This commit is contained in: