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

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

Change-Id: I31e52b03f925ddcdc603500b2f6e23fa741648ef