Merge "Use inclusive language." am: 1222133ffc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377140

Change-Id: I9c0a3a1f135d141fda9bad1ad30594c2d82b6f83