[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6369db7e0 -s ours am: 8aa629ee77 -s ours am: 878d47755d -s ours am: bf7b4cb5a6 -s ours am: ed1d1a3358 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16978594 Change-Id: I72b50f40376d7434a21eb2fc5b5e5d8021b345e9
This commit is contained in: