[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eddce3d73f -s ours am: 7fc8a3361e -s ours am: e91eaccd32 -s ours am: c17e172a6b -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420155 Change-Id: Ia436ee4f16b8eaf3eb156dfc6dc9fb28702cba91
This commit is contained in: