[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: cef1a1294a -s ours am: ad9f77387a -s ours am: 1bb4d35d5d -s ours am: 7eacf92c1d -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420149 Change-Id: I58893eaa8afa5ea18b9f9e269c29aae6e1089df4
This commit is contained in: