[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a3a757c8dc -s ours am: 0bf77bd9c6 -s ours am: c0ab918d54 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519352 Change-Id: I83cd2fc0e83d84d661a7823d4c48e655bc17aeb4
This commit is contained in: