Merge "Remove gendered language" am: 35616155b5 am: 5c018260e0

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

Change-Id: I04e61237104aca879ceed99f3d24cff76fe4570b