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

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

Change-Id: I5a82974b813913d978bcd7eef152a2e45f25af68