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

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

Change-Id: I71212d6f59c04a68942f5bf0b7d5580c9b0ba19d