[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6188def997 -s ours am: 226f1ac296 -s ours am: ac9b41fe6f -s ours am: 7609db7e24 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15209702 Change-Id: I349c09b4c0cd418cb7e60fdf93c7fe0b7bb80e24
This commit is contained in: