Merge "Inclusive Language Fixit: step #5" am: d2965e227e

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1374487

Change-Id: I747f7058effa6d0dfacf11bb3792beadc324ce89