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

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

Change-Id: I3fd2021de8737a3e64e3afca8144b8178c6f7952