[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 69cba5cad9 -s ours am: 478eae4a93 -s ours am: 087f18e061 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15915586 Change-Id: I91f5c6a53cd651117a58775e1121625b05f972e0
This commit is contained in: