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

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

Change-Id: Ie38483d40b3f35b07d5e2a9478ad5ed7a43a9902