[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3077760c14 -s ours am: a7ab127710 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943424 Change-Id: Id2e115267aa2a674c507ac7ccbf4006598d72c54
This commit is contained in: