Merge "Update language to comply with Android's inclusive language guidance" am: 1d2417fa16 am: 436fe675e1 am: 37be2eefe9 am: d82657834a

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

Change-Id: I33f3ef3a15f0b15c4397dee73c2aeb6c3a29061d