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