Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa2365 -s ours" into sc-dev am: 3c65d955f6 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544121 Change-Id: I595e633e55d650bfe0bbe68e894182c929df970d
This commit is contained in: