[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3be97f820b -s ours am: 52440505cd -s ours am: 167096513e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15640446 Change-Id: Ifd32551c871b258b48667c9d290cca9c3306b6f9
This commit is contained in: