Merge "Use more inclusive language for #inclusivefixit" am: b8bcd11f8b am: 6cbe4a610c

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

Change-Id: I2b988ba310d1bf606c8ba090854de746e8f43d26