Merge "Update language to comply with Android's inclusive language guidance" am: 9d7657b62e am: 78e66dbf7d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1382610

Change-Id: I1376f16855dbfa07ac15e0a812617524fa5cebb2