Merge "Use more inclusive language for #inclusivefixit" am: dcc5eeb710 am: 665843167d

Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1378936

Change-Id: Id0d2c325b973ed61298aa92c52d416b6d80f5d76