[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours am: e908f88308 -s ours am: e18a6f61b1 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684410 Change-Id: Iebe9720fb7f6adebf865ffd2118b49fbf512c304
This commit is contained in: