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

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

Change-Id: I4bf86f53b039c338b498afdc83b328b9e9b3ca1d