[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 39695933e7 -s ours am: a49c29bd17 -s ours am: b8da09b396 -s ours am: 38c8324fda -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420258 Change-Id: I2c1a2ca0c8e68d1f6010383200ad950e61edd551
This commit is contained in: