[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59f64e1e92 -s ours am: 79ebe8fe09 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755759 Change-Id: Ieb35387ac514ee7e301f422557f9de6cf53a165c
This commit is contained in: