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

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

Change-Id: Ifff70adc5f59374960ff1ae73602c986e47596a7