[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bb4b4bdc43 -s ours am: 5718baad64 -s ours am: 3df8d0d16b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508890 Change-Id: Ie2fcfd651314367edb16ccf0319a798062d7ff32
This commit is contained in: