Merge "Use more inclusive language for #inclusivefixit" am: 628f288f8a am: 16028dbe6a am: 8af7bfad6f am: d7cb2ed2c8

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

Change-Id: I56c11547078e7567af181f11c485d7a6e87cfd18