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

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

Change-Id: I0a880f82285df3ba48c1a178f3fc154df354da45