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

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

Change-Id: I1d3477f5cf8bd3381680a299782fdf92550df13b