[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ee040c5ff6 -s ours am: 846828162d -s ours am: 5654c66518 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15200286 Change-Id: I5e7e4bed3fc7f4d24c83ad80f621bef878dbb4bc
This commit is contained in: