Merge "Fix jank trigger name on non-english locales" into sc-dev am:...

Merge "Fix jank trigger name on non-english locales" into sc-dev am: 7c6032d0 am: f51418fc am: 7fafc77d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920937

Change-Id: I779faec46575d0b4f0e794dffe840200557d2cf6