Merge "Update language to comply with Android's inclusive language guidance" am: ea575e7bc4 am: 0166574738 am: fd6b8e0da4 am: 49fc83bc70

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

Change-Id: Ia2629fb39ada28fb8af6db92a8163074b6d46835