Merge "Inclusive Language Fixit: step #4" am: ecc8eb7c31

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

Change-Id: I7e4ac32a1f6d6bac14f2bd12a02a1851c59009e8