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