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

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

Change-Id: I4d06189215bd844922bd1addf52ea58b71ee82a9