[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6830e6f622 -s ours am: 61495b90ea -s ours am: b297c87eee -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16796006 Change-Id: I079071bfe267869ccb6f6a01e916395020705e53
This commit is contained in: