[automerger skipped] Import translations. DO NOT MERGE am: f922335371  -s ours
am: a3e0c8002c  -s ours

Change-Id: I454bf03a6cb95dedd7ec999e4076d43d79e128d8
tree: 6613f58c0998abfcd5cac417fa4c4de006b64835
  1. PermissionController/