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

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

Change-Id: I29e4b516dfc6fd59060fb0345c5081b597f8c2c7