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

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

Change-Id: I2334ddb6fc3f5968aafcdd6bd1dd6f2d26004600