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