Merge "Improve captalization in InputMethodSubtype#getDisplayName()." into nyc-dev