Merge "Replace the only user of String8::toUpper()." am: 611202f9b7 am: 7ef724109d am: d7f5fe0932

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1673551

Change-Id: Ide6e251796df11b5f19afe2903953d0104d994d7