Merge "Use inclusive language." am: 1222133ffc am: 19dfb7bf93

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

Change-Id: I2834e1199c4c436f761af170feb743105e5221ae