Merge "Remove gendered language" am: 35616155b5 am: 5c018260e0 am: fc99d35ccf am: 268f3268b1

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

Change-Id: I1072e86f369ecf9fd682c733a703cedb010f66a4