Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9d3c99d8d8 -s ours" into sc-dev am: 482a5edcc8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14981035 Change-Id: I2337f93f4987bc2530549a28c486b9dfbfffdb84
This commit is contained in: