[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35958b264b -s ours am: ecc32fb029 -s ours am: 67254fdad5 -s ours am: 7e8d90b9cc -s ours am: 26881a4601 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16980746 Change-Id: I1f6d7df7cb1801307e095e79d542a559051375d5
This commit is contained in: