[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5da82b96fd -s ours am: d2b6fe8cbf -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943426 Change-Id: I60697965890a59fd0a69925455ecb07bf4cbd317
This commit is contained in: